removed TODO, updated code stlye