code cleanup
clean