Adding comments, removing extraneous code