Merge branch 'refactor-simple'