Refactoring still in process