Code cleanup
Version bump