Fixed some CheckStyle warnings