File contents un-commented and fixed following previous refactor