vjr refactoring per gcc warnings