Address CheckStyle violations