Simple refactoring
Problem 3