Some clean up and adding Student#active, with testing of Student.current