Code cleanup
Release version 1.2(a)