Updated the kirby image, code refactor, tumor

The title. Basically made the code readable and made everything methods
and objects rather than a bunch of vars all over the place.