Cleaning stuff up, not fit for general consumption though

It is alright to look at as far as getting an idea of how to
go about implementing this kind of behavior