Fixin shit, cleaning up

trying to clean up redundancies before I get home.