cleaning up formating, code order