Finish content script refactor