Cleaning up coding style