Adam/some cleaning

@dmitchell 
@cahrens 

Just some small things