Minor code cleanup + Fixed duplicate nickname check