Cleaned up ALL the things! (Okay most)