v0.2.1 - Code refactoring.