Code cleanup for library release 1.0.2.