diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 3394ba2..ae1542d 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -17,36 +17,35 @@
   				@user = existing_user
   				do_update(false, true)
   			else
-  			    redirect_to after_sign_up_error_path_for(resource), alert: I18n.t('helpers.email_already_registered')
+          redirect_to after_sign_up_error_path_for(resource), alert: I18n.t('helpers.email_already_registered')
   			end
   		else
-			build_resource(sign_up_params)
-			if resource.save
-			  if resource.active_for_authentication?
-  				set_flash_message :notice, :signed_up if is_navigational_format?
-  				sign_up(resource_name, resource)
-  				respond_with resource, :location => after_sign_up_path_for(resource)
-			  else
-  				set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_navigational_format?
-  				#expire_session_data_after_sign_in!  <-- DEPRECATED BY DEVISE
-  				respond_with resource, :location => after_inactive_sign_up_path_for(resource)
-			  end
-			else
-			  clean_up_passwords resource
-			  redirect_to after_sign_up_error_path_for(resource), alert: I18n.t('helpers.error_registration_check')
-			end
-		end
+        build_resource(sign_up_params)
+  			if resource.save
+  			  if resource.active_for_authentication?
+    				set_flash_message :notice, :signed_up if is_navigational_format?
+    				sign_up(resource_name, resource)
+    				respond_with resource, location: after_sign_up_path_for(resource)
+  			  else
+    				set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_navigational_format?
+    				#expire_session_data_after_sign_in!  <-- DEPRECATED BY DEVISE
+    				respond_with resource, location: after_inactive_sign_up_path_for(resource)
+  			  end
+  			else
+  			  clean_up_passwords resource
+  			  redirect_to after_sign_up_error_path_for(resource), alert: I18n.t('helpers.error_registration_check')
+  			end
+		  end
     end
   end
 
 
- def update
- 	if user_signed_in? then
-		@user = User.find(current_user.id)
-
-        do_update
+  def update
+  	if user_signed_in? then
+      @user = User.find(current_user.id)
+      do_update
     else
-    	render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false)
+      render(file: File.join(Rails.root, 'public/403.html'), status: 403, layout: false)
     end
   end
 
@@ -56,8 +55,7 @@
   # ie if password or email was changed
   # extend this as needed
   def needs_password?(user, params)
-    user.email != params[:user][:email] ||
-      params[:user][:password].present?
+    user.email != params[:user][:email] || params[:user][:password].present?
   end
 
   def do_update(require_password = true, confirm = false)
@@ -71,7 +69,7 @@
         @user.update_without_password(params[:user])
       end
     else
-    	@user.update_attributes(:password => params[:user][:password], :password_confirmation => params[:user][:password_confirmation])
+    	@user.update_attributes(password: params[:user][:password], password_confirmation: params[:user][:password_confirmation])
     	successfully_updated = @user.update_without_password(params[:user])
     end
 
@@ -79,13 +77,13 @@
     if params[:user][:language_id]
       if @user.language_id != params[:user][:language_id]
         params[:locale] = Language.find(params[:user][:language_id]).abbreviation
-        set_locale 
+        set_locale
       end
     end
-    
+
     #unlink shibboleth from user's details
     if params[:unlink_flag] == 'true' then
-      @user.update_attributes(:shibboleth_id => "")
+      @user.update_attributes(shibboleth_id: "")
     end
 
     if successfully_updated
@@ -95,21 +93,15 @@
   		end
         set_flash_message :notice, :updated
         # Sign in the user bypassing validation in case his password changed
-        sign_in @user, :bypass => true
-        
-        #if params[:unlink_flag] == 'true' then
-            redirect_to({:controller => "registrations", :action => "edit"}, {:notice => I18n.t('helpers.project.details_update_success')})
-        #else
-        #    redirect_to({:controller => "projects", :action => "index"}, {:notice => I18n.t('helpers.project.details_update_success')})
-        #end
-
+        sign_in @user, bypass: true
+        redirect_to({controller: "registrations", action: "edit"}, {notice: I18n.t('helpers.project.details_update_success')})
     else
       render "edit"
     end
   end
 
   def sign_up_params
-    params.require(:user).permit(:email, :password, :password_confirmation, :accept_terms, 
+    params.require(:user).permit(:email, :password, :password_confirmation, :accept_terms,
                                  :organisation_id, :other_organisation)
   end