Corrected indentation. Checked return value problem for auto_remap was corrected and eliminated commented lines.