Corrected all remaining checkstyle errors.
Changed maven checkstyle configuration