oops, should have been included with previous batch of commits, part of code refactoring