Adjust micdoodle8's additions to my coding style