Fix some more indentation errors + clean some misterious whitespaces