a major refactor underway
a minor cleanup