Cleaned some stuff up.
Learned about super.methods today thought I could use that on some
sub-classes.
Turns out I still didn't need that anyways. Good to know for the future
though...