Bugs of indentation corrected