Cleaning up code formatting & style