more consistant look, killed some dead code