Problem 27:tweak with some refactoring