refactoring and version bump to v1.6.0