Break up payload method

Make Code Climate happy.