Version 0.07: code cosmetics