Style changes suggested by @abellonch