Refactored some more..