This should be valid for NEK integration.
Formatting fixes
Function missed
Merge pull request #1155 from TheTemportalist/master

This should be valid for NEK integration.