Indentation
Revert "fix compile errors after rebasing onto sven's changes", added to wrong traits class

This reverts commit 52a0658e471d426092dd6c1146599cfcbc1a9593.
Added remaining post-merge fixes