Clean up code

[yelper]

The code should be re-written in an object-oriented sense, with parameters divorced from methods. The rendering workflow should be clearer, and unit tests should be written.