Added User Name methods, code cleanup