corrections
refactor into resources