cleaned up todos