Refactoring some descriptions