Re indent
Re indent
Fix Rails 3 compat