Adding comments, cleaning things up