bdaroz Clean up and reformat code

Users who have contributed to this file

• bdaroz