Naming (of privates) and other minor refactoring.