Formatting fixes (whitespaces)