Cleanup
Start refactoring article export