cleaning up todos and inconsistent method signature