coding standards cleanup