Up version to 1.2 and clean up code