simplify
remove unneeded code
refactor