simplify some of the commands and clean up some formating.