Refactorred Kitty module

Got rid of unnecessary code
simplified some of the functions