Adjust theZorro's additions to my coding style