Added TODO's to improve the solution of the CountNonDivisible problem
Removed code duplications