Maintenance update

headings made more generic

code cleanup (extra spaces and extra units)