Style issues fixed