Cleanup and updated TODO