Version update, code cleanup