Updated comments and improved form layout.