cleaning up some whitespace and warnings. warning free since 2013