misc style tuneups
misc style tuneups