Refactor
clean up