Cleanup and import reordering according to new Plone guidelines