cleaned up gems