Refactoring... :S