Mad final clean ups

I made sure everything was in order