Code style slightly changed