Very minor refactoring
Bump to v0.2.0pre3