removed some todos and fixed some formatting