rm whitespaces
improve auth