coding standards fixes, additional clean up