Refactoring begins now...