Fix order and indentation