Version 0.08: code cosmetics