Adjust style with advice by @norio