v0.1.10 - Code cleanup