Little refactoring
Bump 0.3.25