Refactor

+1