General Cleanup of Everything

Does the same things, just more intuitively and more naturally OOP
style, yo.