More cleanup... yet can't figure out how to sneak in description