KFSUGPRADE-1017 comments and code cleanup