Reduced number of TODO comments