code clean up ticket fix-121