Completed refactoring, added PedanticNotation.