Merge "Comments and code cleanup in OutputPage"