Refactor default gems
Add docblocks and simple refactoring