Code cleanup.
Version bump 0.3.1.