small refactor and editted Gemfile