Refactoring
Bump version to 1.7.0