Cleaned up the gem