Refactor - #15