diff --git a/Gemfile b/Gemfile
index 1d443b928..799b2773a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,13 +32,13 @@ gem 'selectize-rails', '~> 0.11.0' # '0.11.2' # include selectize.js for select
 gem 'kaminari', '~> 0.16.1'         # pagination
 gem 'nprogress-rails', '~> 0.1.3.1' # '0.1.6.5' # visual loader
 
-# rest api
-gem 'grape', '~> 0.10.1'
-
 # rights
 gem 'devise',    '~> 3.3.0' # '3.4.0' # authenitcation
 gem 'cancancan', '~> 1.9.2' # autharization
 
+# rest api
+gem 'grape', '~> 0.10.1'
+
 # registry specfic
 gem 'simpleidn', '~> 0.0.5' # For punycode
 gem 'isikukood' # for EE-id validation
@@ -47,95 +47,58 @@ gem 'isikukood' # for EE-id validation
 gem 'whenever', '~> 0.9.4', require: false
 gem 'daemons'  '~> 1.1.9' # process delayed jobs
 
-group :development, :test do
-  # for inserting dummy data
-  gem 'activerecord-import', '~> 0.6.0'
-
-  gem 'capybara', '~> 2.4.1'
-  # For feature testing
-  # gem 'capybara-webkit', '1.2.0' # Webkit driver didn't work with turbolinks
-  gem 'phantomjs-binaries', '~> 1.9.2.4'
-  gem 'poltergeist', '~> 1.5.1' # We are using PhantomJS instead
-  gem 'phantomjs', '~> 1.9.7.1'
-
-  # For cleaning db in feature and epp tests
-  gem 'database_cleaner', '~> 1.3.0'
-
-  # EPP client
-  gem 'epp', '~> 1.4.0'
-
-  # EPP XMLs
-  gem 'epp-xml', '~> 0.10.3'
-
-  # Replacement for fixtures
-  gem 'fabrication', '~> 2.11.3'
-
-  # Library to generate fake data
-  gem 'faker', '~> 1.3.0'
-
-  # For debugging
-  gem 'pry', '~> 0.10.1'
-  # gem 'pry-byebug', '~> 1.3.3'
-
-  # Testing framework
-  gem 'rspec-rails', '~> 3.0.2'
-
-  # Additional matchers for RSpec
-  gem 'shoulda-matchers', '~> 2.6.1', require: false
-
-  # For unique IDs (used by the epp gem)
-  gem 'uuidtools', '~> 2.1.4'
-
-  # For code review
-  gem 'simplecov', '~> 0.9.1', require: false
-  gem 'rubycritic', '~> 1.1.1'
-
-  # for finding database optimizations
-  gem 'bullet', '~> 4.14.0'
-
-  # for finding future vulnerable gems
-  gem 'bundler-audit'
-
-  # for security audit'
-  gem 'brakeman', '~> 2.6.2', require: false
-
-  # bundle exec rake doc:rails generates the API under doc/api.
-  gem 'sdoc', '~> 0.4.0'
-
-  # faster dev load time
-  gem 'unicorn'
-
-  # for opening browser automatically
-  gem 'launchy', '~> 2.4.3'
-end
-
 group :development do
-  # Spring speeds up development by keeping your application running in the background.
-  # Read more: https://github.com/rails/spring
-  gem 'spring', '~> 1.2.0'
+  # dev tools
+  gem 'spring',                '~> 1.2.0'
   gem 'spring-commands-rspec', '~> 1.0.2'
-
-  # for fast deployment
-  gem 'mina', '~> 0.3.1'
-
-  # for finding dead routes and unused actions
-  gem 'traceroute', '~> 0.4.0'
-
-  # for improved errors
-  gem 'better_errors', '~> 2.0.0'
-  gem 'binding_of_caller', '~> 0.7.2'
-
-  # run tests automatically
-  gem 'guard', '~> 2.6.1'
-
-  # rspec support for guard
+  gem 'guard',                 '~> 2.6.1' # run tests automatically
   gem 'guard-rspec', '~> 4.3.1'
   gem 'rubocop', '~> 0.26.1'
   gem 'guard-rubocop', '~> 1.1.0'
 
-  # to generate database diagrams
-  gem 'railroady'
+  # improved errors
+  gem 'better_errors',     '~> 2.0.0'
+  gem 'binding_of_caller', '~> 0.7.2'
+  gem 'traceroute',        '~> 0.4.0' # for finding dead routes and unused actions
 
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  # deploy
+  gem 'mina', '~> 0.3.1' # for fast deployment
   gem 'therubyracer',  platforms: :ruby
 end
+
+group :development, :test do
+  # test stack
+  gem 'rspec-rails', '~> 3.0.2'
+  gem 'capybara',           '~> 2.4.1'
+  gem 'phantomjs-binaries', '~> 1.9.2.4'
+  gem 'poltergeist',        '~> 1.5.1'  # We are using PhantomJS instead
+  gem 'phantomjs',          '~> 1.9.7.1'
+  gem 'fabrication',        '~> 2.11.3' # Replacement for fixtures
+  gem 'shoulda-matchers',   '~> 2.6.1', require: false # Additional matchers for RSpec
+  gem 'launchy',            '~> 2.4.3' # for opening browser automatically
+
+  # helper gems
+  gem 'activerecord-import', '~> 0.6.0' # for inserting dummy data
+  gem 'database_cleaner',    '~> 1.3.0' # For cleaning db in feature and epp tests
+  gem 'faker',               '~> 1.3.0' # Library to generate fake data
+
+  # EPP 
+  gem 'epp',     '~> 1.4.0'   # EPP client
+  gem 'epp-xml', '~> 0.10.3'  # EPP XMLs
+  gem 'uuidtools', '~> 2.1.4' # For unique IDs (used by the epp gem)
+
+  # debug
+  gem 'pry', '~> 0.10.1'
+
+  # code review
+  gem 'simplecov',     '~> 0.9.1', require: false
+  gem 'rubycritic',    '~> 1.1.1'
+  gem 'bullet',        '~> 4.14.0' # for finding database optimizations
+  gem 'bundler-audit', '~> 0.3.1'  # for finding future vulnerable gems
+  gem 'brakeman',      '~> 2.6.2', require: false # for security audit'
+  gem 'sdoc',          '~> 0.4.0'  # bundle exec rake doc:rails generates the API under doc/api.
+  gem 'railroady'      '~> 1.3.0'  # to generate database diagrams
+
+  # dev tools
+  gem 'unicorn'
+end