Cleaned up todos