Fixed formatting. Added todos.