Version 2.02: code cosmetics