some identation updates
Merge remote-tracking branch 'origin/nico'