Add comments, review code