factorize code
change method name
coverage fix