Save me work before any forest fires
Moved code into helper files