NIBG-1272 changes

Can you have a look at the identation of this file, I get a lot of changes now.