Refactor and change description