refactor Props class
refactor