Finished implementing the kata. Refactor?