Some local indentation fixing as well because spaces and tabs were mixed up and it was confusing to read