refactor calue method definitions

use helper class methodds to define