tidied up gem requires and inclusions