comments, code cleanup