Refactor, first version 0.0.1