fix repeated value
remove redundant import
split up function where the interface break will be