ver 1.2: minor refactors