Cleaned helpers and resolved Arkkimaagi/assemble-website-template/#4 for now