Serious cleanup and some formatting

Refresh imports and exports are now officially deleted ...