Some cleanup, not a lot
Things are starting to heat up