Update helper calls
Uncomment IP based access control code
Relocate page-level docblock
Code formatting and cleanup