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