Leave it the way it was before, it's a bit cleaner (maybe extend the imports to more lines)