Merge "Fix indentation for re-organized code"