Kata3.2: Fixed last problems. Refactoring needed.