Some refactoring
Added max values to exercise
Refactoring