Code refactoring...