Refactoring still in progress