Fix indent
Fix an order