Just cleaning up. Renaming, adding some things etc.