Code refactoring in progress...