#5 lint fixes