update todo
minor style changs