Version 1.09: code cosmetics