Code style updated/fixed