Some minore refactoring and updated descs
Some minor refactoring and updated desc