Implemented where Student class is used and a few minor edits/changes to code