Re indent
Minor fixes, Rails compat