Refactor option description and some code