Spaces and non-spaces code-styling fixes (Thanks @nonumber)