clearing things up a bit
cleanups and format fixes