Refactored templates. Fixes #4

formatting: we could remove this empty line