More code style fixes (spaces again)