Refactoring - #15