Code cleanup
1.2.2 release