cleanup #21
1.0.1