clean up/reformat
refactored describe macro