Improve the markdown and remove boilerplate code