Slight cleanup

More to come soon, I promise! (features, that is) :ice_cream: