Made some changes in add and remove based on instructor comments