v0.0.4 - Some Refactoring