Features/cleanups

Wanted to poke around, just started cleaning things up as I went.