Code refactoring due to influences...