Refactored some more stuff. :)