Fix issues pointed out in the MR, mostly coding style and one unused variable