Fix Style issues