minor refactor: reduce style warnings
3 files changed