refactoring: avoid more compiler warnings