Minor cleanup, update version