Class comments and cleanup