#997 Comment/code cleanup