Fixed tidy errors