#1 - Partial refactoring Gemfile setup