Refactoring

Some lexical changes.