Some more changes to the CheckStyle