Clean code refactoring.