Refactor - #3