Style issues are fixed