Try and improve indentation for readability