Refactor the rest of the fragments