and restructure it a bit