Formatting fixes: remove extra spaces