Hotfix for ever-lasting smoke

Also has a few trailing whitespaces stripped.