More comments and cleanup