Refactoring to increase code quality.