Further refactoring to change away from hungarian coding style.