code cleanup
coding standards update