cleaned old comments and some class things.