Refactor
Version bump