Rename variables and fail early if username is already taken
Do some text cleanup