Some Cleanup, TODOs removed, COmments cleaned