code cleanup
0.0.3