Comments and code cleanup in OutputPage