Refactor

Updated code for katas