Removing extra comments, consolidating code