Stylistic fixes, linting
Put back erroneously deleted comment