Code refactoring. Work in progress...