Update gemfile and some stylistic changes