Raindrops exercise - 2nd iteration..Refactoring