Code cleanup. Bump to v2.0.6
Update Cleanup v2.0.6