removed a bunch of comments, cut down on conditional statements