Fix linting errors

@alex-deaconu please review.  No functionality changes mixed in here.