cleaning up

removing redundant lines, clarifying comments/variable names