Cleanup coding style