Organized Todo a bit more