Update VFMapper.java

clean up