integrated some of the CheckStyle suggestions ...