Added consolidation of comments, etc.