v0.2.5 - code refactoring