1.0.1: code cleanup