Clean up code style