Template and messaging changes
Comments and removal of unnecessary code.