* Code cleanup per TimStarling's suggestions