Version 1.01: code cosmetics