minor refactor: reduce style warnings