Added CheckStyle changes