Code cleanup and streamlined constructor chaining.