code cleanup + TaskFactory
suggestion query