Fix multiple style warnings