refactoring: clean compiler warnings about static calls