cleaned up a few messy things