better handling on indentation