CheckStyle warnings fixed