cleanup and update
1.0.2