Refactor

Refactors to rely on private state and remove this / that / self pattern in lieu of a global config object.