Removed some lines for class work