Fixed remaining CheckStyle errors