Cleaning up how the nick is set