Update Gems
Code cleanup