Stay DRY!

Just some cleanups and repetition fixes :)