Applied comments by @stof