code cleanup
clean history