clean up of warnings/formatting