Version 1.06: code cosmetics