XNAT-2964 (Improvement - In Progress): Refactoring pass 2: New feature additions + Google closure standards.