Fix indent and space style (not yet all style was fixed)