Merge pull request #53 from sergi/43-refactor

Refactor everything