Further refactoring away from hungarian notation.