Better order and indentation