Notation cleanup