done some refactoring and changed the gemfile
done some refactoring and changed the gemfile