More cleanup, capitalize displayed usernames