add some todos and cleaned up formatting