Minor changes and code style fixes
Merge branch 'aschoelzhorn-master'
Revert "new method Navigate(Type source, object paramter)"

This reverts commit 68e7c2206dc012bbf452ea7fe5cb2b7a1b2ef8c3.