Refactor step 2
Bump up version