Modified coding style slightly