VE-1332 Refactor method names and format
VE-1332 Refactor methods