Cleanup
Coding style