Some refactoring to remove NinjaIDE format recommendations