Cleaned up gems