Version 0.06: code cosmetics