Refactor object descriptions