add comments; rename func; mark any long lines left