- [ ] Move file handling code to its helper file - [ ] Move Template handling code to its helper file - [ ] Identify any other areas of optimisation