Additional refactoring and some proj1 occurrences