Cleaning up code formatting
more cleaning up formatting