refactoring: clean some warnings