Completed comments. Removed unnecessary classes