more minor refactoring while trying to understand the current code
whitespace
framework for another approach to tracking and maintaining consistency