A little bit of source cleanup + update version to 1.2