Attemp number 2 at making Hound CI happy, fixing mainly parameter alignment and {, } spaces