Code clean-up to new idiomatic style.