diff --git a/app/models/diffed_note_tag_list.rb b/app/models/diffed_note_tag_list.rb
index 44cf8fe3..5df3c684 100644
--- a/app/models/diffed_note_tag_list.rb
+++ b/app/models/diffed_note_tag_list.rb
@@ -33,7 +33,7 @@ def initialize(previous_tag_list, tag_list)
       }
     end
 
-    @list = Hash[diffed_tag_list.sort]
+    self.list = Hash[diffed_tag_list.sort]
   end
 
   def is_obsolete?(tag)
diff --git a/app/models/diffed_note_version.rb b/app/models/diffed_note_version.rb
index 616a4eb4..8bcfff6c 100644
--- a/app/models/diffed_note_version.rb
+++ b/app/models/diffed_note_version.rb
@@ -11,30 +11,30 @@ def initialize(note, sequence)
 
     if sequence == 1
       version = versions.first.reify
-      @previous_title = ''
-      @previous_body = ''
-      @tag_list = versions.first.tag_list
-      @previous_tag_list = []
+      self.previous_title = ''
+      self.previous_body = ''
+      self.tag_list = versions.first.tag_list
+      self.previous_tag_list = []
     elsif sequence == versions.size + 1
       version = note
       previous_version = versions.last.reify
-      @previous_title = previous_version.title
-      @previous_body = previous_version.body
-      @tag_list = version.tag_list
-      @previous_tag_list = versions.find_by_sequence(sequence - 1).tag_list
+      self.previous_title = previous_version.title
+      self.previous_body = previous_version.body
+      self.tag_list = version.tag_list
+      self.previous_tag_list = versions.find_by_sequence(sequence - 1).tag_list
     else
       version = versions.find_by_sequence(sequence).reify
       previous_version = version.previous_version
-      @previous_title = previous_version.title
-      @previous_body = previous_version.body
-      @tag_list = versions.find_by_sequence(sequence).tag_list
-      @previous_tag_list = versions.find_by_sequence(sequence - 1).tag_list
+      self.previous_title = previous_version.title
+      self.previous_body = previous_version.body
+      self.tag_list = versions.find_by_sequence(sequence).tag_list
+      self.previous_tag_list = versions.find_by_sequence(sequence - 1).tag_list
     end
 
-    @sequence = sequence
-    @title = version.title
-    @body = version.body
-    @embeddable_source_url = version.embeddable_source_url
-    @external_updated_at = version.external_updated_at
+    self.sequence = sequence
+    self.title = version.title
+    self.body = version.body
+    self.embeddable_source_url = version.embeddable_source_url
+    self.external_updated_at = version.external_updated_at
   end
 end
diff --git a/app/models/evernote_note.rb b/app/models/evernote_note.rb
index 96d1f77f..5f1c3fb0 100644
--- a/app/models/evernote_note.rb
+++ b/app/models/evernote_note.rb
@@ -5,10 +5,7 @@ class EvernoteNote < CloudNote
   include EvernoteHelper
 
   def self.add_task(guid)
-    self.where(cloud_note_identifier: guid,
-               cloud_service_id: cloud_service.id)
-              .first_or_create
-              .dirtify
+    self.where(cloud_note_identifier: guid, cloud_service_id: cloud_service.id).first_or_create.dirtify
   end
 
   def self.sync_all
@@ -18,18 +15,14 @@ def self.sync_all
   def self.bulk_sync
     filter = Evernote::EDAM::NoteStore::NoteFilter.new(
       notebookGuid: Settings.evernote.notebooks,
-      words: Settings.evernote.instructions.required.join(' ')
-              .gsub(/^/, 'tag:')
-              .gsub(/ /, ' tag:'),
+      words: Settings.evernote.instructions.required.join(' ').gsub(/^/, 'tag:').gsub(/ /, ' tag:'),
       order: 2,
       ascending: false
     )
     spec = Evernote::EDAM::NoteStore::NotesMetadataResultSpec.new
 
     cloud_notes = cloud_service.evernote_note_store
-                  .findNotesMetadata(cloud_service
-                                      .evernote_oauth_token,
-                                      filter, 0, 999, spec)
+                  .findNotesMetadata(cloud_service.evernote_oauth_token, filter, 0, 999, spec)
     cloud_notes.notes.each do |cloud_note|
       EvernoteNote.add_task(cloud_note.guid)
     end
@@ -40,9 +33,7 @@ def syncdown_one
 
     increment_attempts
 
-    cloud_note_metadata = note_store
-                          .getNote(oauth_token,
-                                   guid, false, false, false, false)
+    cloud_note_metadata = note_store.getNote(oauth_token, guid, false, false, false, false)
 
     # File.open('evernote_metadata.json', 'w') 
     # {|f| f.write(cloud_note_metadata.to_json) }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3b5bb120..5d0a53fb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,14 +1,14 @@
 en:
 
   auth:
-    success: "Your %{provider} key has been authenticated."
-    failure: "%{provider} authentication failed!"
+    success: "Your %{ provider } key has been authenticated."
+    failure: "%{ provider } authentication failed!"
     email:
-      subject: "%{provider} authentication required"
-      body: "%{provider} authentication is missing. Please authenticate your key for this provider by visiting %{url}"
+      subject: "%{ provider } authentication required"
+      body: "%{ provider } authentication is missing. Please authenticate your key for this provider by visiting %{ url }"
 
   email:
-    greeting: "Hi %{name}"
+    greeting: "Hi %{ name }"
     signature: "joegatt.net"
 
   site:
@@ -22,30 +22,30 @@ en:
 
   notes:
     title: "Notes"
-    item: "Note %{id}"
-    short: "Note %{id}"
+    item: "Note %{ id }"
+    short: "Note %{ id }"
     versions:
       title: "Versions"
-      item: "Version %{sequence}"
-      short: "v%{sequence}"
-      full: "Note %{id} v%{sequence}"
+      item: "Version %{ sequence }"
+      short: "v%{ sequence }"
+      full: "Note %{ id } v%{ sequence }"
     untitled_synonyms: ["Untitled", "Untitled note", "New note"]
     sync:
-      updated: "%{provider}: note %{guid} (%{title}) updated."
+      updated: "%{ provider }: note %{ guid } (%{ title }) updated."
       rejected:
-        version_not_ok: "%{provider}: note %{guid} (%{title}) for user %{username} failed! The SDK is out of date."
-        not_authenticated: "%{provider}: note %{guid} rejected! Your %{provider} API key is not authenticated."
-        not_in_notebook: "%{provider}: note %{guid} (%{title}) for user %{username} rejected! Not in required notebook."
-        deleted_note: "%{provider}: note %{guid} (%{title}) for user %{username} rejected! Note has been deleted from cloud notebook."
-        tag_missing: "%{provider}: note %{guid} (%{title}) for user %{username} rejected! Missing required tag."
-        ignore: "%{provider}: note %{guid} (%{title}) for user %{username} rejected! Contains instructions to ignore."
-        not_latest: "%{provider}: note %{guid} (%{title}) for user %{username} rejected! Already have latest version."
-      update_error: "%{provider}: note %{guid} failed on database update!"
+        version_not_ok: "%{ provider }: note %{ guid } (%{ title }) for user %{ username } failed! The SDK is out of date."
+        not_authenticated: "%{ provider }: note %{ guid } rejected! Your %{ provider } API key is not authenticated."
+        not_in_notebook: "%{ provider }: note %{ guid } (%{ title }) for user %{ username } rejected! Not in required note"
+        deleted_note: "%{ provider }: note %{ guid } (%{ title }) for user %{ username } rejected! Note has been deleted from cloud note"
+        tag_missing: "%{ provider }: note %{ guid } (%{ title }) for user %{ username } rejected! Missing required tag."
+        ignore: "%{ provider }: note %{ guid } (%{ title }) for user %{ username } rejected! Contains instructions to ignore."
+        not_latest: "%{ provider }: note %{ guid } (%{ title }) for user %{ username } rejected! Already have latest version."
+      update_error: "%{ provider }: note %{ guid } failed on database update!"
       failed:
-        logger: "%{provider}: note %{guid} (%{title}) failed on database update!"
+        logger: "%{ provider }: note %{ guid } (%{ title }) failed on database update!"
         email:
-          subject: "%{provider}: note %{guid} failed on database update!"
-          body: "%{provider}: note %{guid} for user %{username} failed on database update!"
+          subject: "%{ provider }: note %{ guid } failed on database update!"
+          body: "%{ provider }: note %{ guid } for user %{ username } failed on database update!"
 
   resources:
     cut:
@@ -55,20 +55,20 @@ en:
 
   tags:
     title: "Tags"
-    item: "%{name}"
-    short: "%{name}"
+    item: "%{ name }"
+    short: "%{ name }"
 
   books:
     title: "Bibliography"
-    item: "%{name}"
-    short: "%{name}"
+    item: "%{ name }"
+    short: "%{ name }"
     editor_short: "(ed.)"
 
   citations:
     default:
-      inline: "#{ surname } #{ short_year }"
-      index: "#{ surname }: #{ title }"
-      full: "#{ surname }, #{ name }. #{ title }. #{ city }: #{ publisher }, #{ long_year }."
+      inline: "%{ author_surname } %{ published_date }"
+      index: "%{ author_surname }: %{ title }"
+      full: "%{ author_sort }. %{ title }. %{ published_city }: %{ publisher }, %{ published_date }."
 
   titlecase_exceptions:
     articles: "a an the"