Further code clarity polish.