More code clarity changes.