Adding data checks to public methods;
Normalizing public method loops;