fix: and cleanup anti-idioms
3 files changed