Addressed wvwdt1 style suggestions