try to clean up coding standards a bit