more refactor - added username