Minor refactoring and fix of markdown.