Code cleanups, bump version to 1.2