code update/cleanup
STUD-1133