Code cleanup and class summaries updated