general refactoring; new parser expressions