Re-trying style, made some linter-suggested changes.