Clean up coding style