Refactor

g