Basic Assignment seems done
Removing unnecessary code and commenting