tidy up Notation class