Clean up article code to fit with framework