Cleaning up code style