Refactoring still going on...