Refactoring 0.3.0