Cleaned up code

Got rid of cats haha