Clean up whitespace, move common-use templates to own folder

#36