Reformatting and cleaning up code (step 1/2)