Refactoring - in progress