Style changes, updated TODO