General cleanup
Bump version to 1.2.0