Minor refactoring and mandatory nick identification