cleanup, speedup
0.3.8