Adding some guarding defines.
Templating srfs method.
Formatting.