Refactoring in progress
..