Cleanup code formatting in various files