rename value setting method
add getter and setter
clean code a little