Started refactoring to non hungarian naming style.