Modernize style
cleanups