Clean up
Changed 'username' to 'nick'