More code cleanup
Adding gem in