Added some todos and made some cleanup