Initial cleanup. Left to do: Fix singleton, fix constants, fix function/method paradigm, fix parens abuse, document changes, refactor.
Initial cleanup. Left to do: Fix singleton, fix constants, fix function/method paradigm, fix parens abuse, document changes, refactor.