Code clean up and adding KataSix