v0.1.7 - Code cleanup