refactor
remove redundant stuff