Fix if-bracket and empty-enumerable style
Revert "Roll back noisy/pointless changes"

This reverts commit 8a6b156099aaeb185c6de8df20f9eb0f5d58c3be.