Documentation, cleanup, removed double classes