Normalizing public method loops;
Cleaning code;