modified Gemfile
General refactoring