Sorted using Notepad++ TextFX

Sorted using the TextFX function.
Fixed bug related to params/results template refactoring.