remove redundant method
break up some long lines