Code refractoring, checkstyle errors fixed.