Cleaning up all Classes a bit