fixing lint recommendations