Code cleanup
Coding standards