Commented out unneccicary logic
Fixed number
Finished class