Replace all uses of Nick with Identifier
Fix style errors