Adding comments, some cleanup