Cleanup and add markdown