general comments/code cleanup