Better handling of indentation