Code style upgraded