Refactoring v1.0