code cleanup
0.5.2