Moving out unused method and improving consistency of utils.extension