Refactor v0.0.1.5