Fixed username string
Created link class and moved some methods