Update Helpers, clean up templates