code cleanup user_name -> username