fixed some CheckStyle issues