:thumbsup: this is more readable yes