--- a/app/helpers/.LCKarticles_helper.rb~
+++ /dev/null
@@ -1 +0,0 @@
-/home/mtkd/projects/gitlab/app/helpers/.LCKarticles_helper.rb~
\ No newline at end of file

--- a/app/helpers/articles_helper.rb
+++ b/app/helpers/articles_helper.rb
@@ -20,7 +20,7 @@ module ArticlesHelper
     out << %Q{<div class='articlebox #{article.article_type.to_s}'><div class='formattedtext'>}
     #
     # title
-    if use_permalink then
+    if use_permalink
       out << %Q{<h2 class='blacklink'>}
       out << %Q{#{article.project.title}: } if article.project.id > 1
       out << %Q{#{link_to_article(article)}</h2>}
@@ -36,7 +36,7 @@ module ArticlesHelper
     # date by user
     out << %Q{<h5>#{format_datetime_article(article.created_at)} by #{link_to(article.user.fullname, user_path(article.user))}}
     #
-    if article.category.id > 1 then
+    if article.category.id > 1
       out << %Q{ in <a href='/archives/category/#{to_slug(article.category.name)}'>#{article.category.name}</a>}
     else
       # if no category, show a project link (if available)
@@ -49,7 +49,7 @@ module ArticlesHelper
     out << %Q{, #{0} comments</h5>}
     #
     # body
-    if short then
+    if short
       article.body_summary.length > 0 ? out << article.body_summary : out << article.body
     else
       out << article.body
@@ -68,8 +68,8 @@ module ArticlesHelper
     out = %Q{<div id='archive'>}
     for article in articles
       #FIXME can remove the .to_s from the temp year/month variables
-      if year != article.created_at.year.to_s then
-        if year_started then
+      if year != article.created_at.year.to_s
+        if year_started
           out << %Q{</ul>} if month_started
           out << %Q{</li></ul>}
         end
@@ -79,7 +79,7 @@ module ArticlesHelper
         out << %Q{<h2>#{year}</h2><ul><li>}
       end
       #
-      if month != article.created_at.month.to_s then
+      if month != article.created_at.month.to_s
         out << %Q{</ul>} if month_started
         month_started = true
         month = article.created_at.month.to_s
@@ -110,7 +110,7 @@ module ArticlesHelper
         out << %Q{<td width=90>#{get_article_bullet(article.article_type)} #{article.article_type.to_s.capitalize}</td>}
         out << %Q{<td>#{link_to_article(article)}</td>}
         out << %Q{<td width=140>}
-        if article.project.id > 1 then
+        if article.project.id > 1
           out << link_to(article.project.title, article_project_path(article.project.slug))
         else
           #FIXME sitename/domainname aren't clear, using domainname mostly
@@ -129,12 +129,12 @@ module ArticlesHelper
   end
   
   def apg_cell (col, a, u)
-    if a != nil then      
+    if a != nil      
       @c = @c + a.type_count.to_i
       out = %Q{<td style='border-top: 1px solid #ccc; background-color: #{col}'>}
-      if a.type_count.to_i > 0 then
+      if a.type_count.to_i > 0
         # if sitename row, use a different slug
-        if u == "" then
+        if u == ""
           #FIXME this is wrong, it should only show SiteName articles
           out << %Q{<a href='/archives/#{SITENAME}/#{a.article_type.to_s}'>#{a.type_count.to_s}</a>}
         else
@@ -154,7 +154,7 @@ module ArticlesHelper
     # project or sitename td
     out = %Q{<tr><th style='border-top: 1px solid #ccc;'>}
     # sitename or project name
-    if p == "Other" then
+    if p == "Other"
       out << %Q{#{link_to("Other", article_sitename_path)}}
     else
       #FIXME had to frig this until project routes merged
@@ -169,15 +169,6 @@ module ArticlesHelper
     out << apg_cell('#fff8ee', a[4], u)
     out << apg_cell('#eee', a[5], u)
     # total column
-#    out << %Q{<td style='border-top: 1px solid #ccc;'>}
-#    if @c.to_i > 0 then
-#      out << %Q{<a href='/archives/}
-#      # if sitename row, use a different slug
-#      u == "" ? out << %Q{#{SITENAME}'>} : out << %Q{project/#{u}'>}
-#      out << %Q{#{@c.to_s}</a>}
-#    else
-#      out << %Q{0}
-#    end
     out << %Q{</td></tr>}
     out
   end
@@ -208,7 +199,6 @@ module ArticlesHelper
     out << rapg_row("issue", "12", "42")
     out << rapg_row("howto", "12", "55")
     out << rapg_row("other", "13", "45")
-    #out << %Q{<td style='padding-top: 4px'></td>}
     out << %Q{</tr>}
     out << %Q{</table>}
     out

--- a/app/models/.LCKproject.rb~
+++ /dev/null
@@ -1 +0,0 @@
-/home/mtkd/projects/gitlab/app/models/.LCKproject.rb~
\ No newline at end of file

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -153,12 +153,7 @@ class Project < ActiveRecord::Base
     #
     def self.allowed_access (project_id, curruser)
       projects_allowed = Project.list_for_user(curruser)
-      p = find(:first, :conditions => ["status = '#{:active}' AND projects.id = '" << project_id.to_s << "' AND ( audience = '#{:public}' OR projects.id IN (" << projects_allowed << ") )"])
-      if p != nil then
-        return true
-      else
-        return false
-      end
+      find(:first, :conditions => ["status = '#{:active}' AND projects.id = '" << project_id.to_s << "' AND ( audience = '#{:public}' OR projects.id IN (" << projects_allowed << ") )"])
     end
 
     #
@@ -204,25 +199,21 @@ class Project < ActiveRecord::Base
     # Get a list of project_ids of a user is a members of in the format '1','2','3'
     #
     def self.list_for_user(user)
-      if user != nil then
+      if user
         list = ""
         projects = Member.find_by_user(user.id)
         unless projects.empty?
           start = true
           for project in projects
-            if not start then
-              list = list << ","
-            else
-              start = false
-            end
+            !start ? list = list << "," : start = false
             list = list << "'" << project.project_id.to_s << "'"
           end
-          return list
+          list
         else
-          return "'1'" # see below
+          "'1'" # see below
         end
       else
-        return "'1'" # Project.id 1 is no project (this is a bit of a frig really, without it 2 queries will be needed for all finds)
+        "'1'" # Project.id 1 is no project (this is a bit of a frig really, without it 2 queries will be needed for all finds)
       end
     end