File renames, indent and minor touches.