Removing friendly function names where unnecessary