Fix style issues mentioned by houndci