Refactor

done