Applied comments by @cordoval