Code cleanup in 0.1.5