Refactor description display, add documentation