clean readHandler, added TODOs