minor cleanup and removal of stupidity because wow I am tired