Cleanup, encapsulation, improvements. More to come