Improve code style thanks to @remh feedback