minor cleanup and using full name as user identifier