Refactored some...