small code cleanup
updated TODO