code cleanup/update
STUD-154