cleaned up remanents from prev iteratoin
fixed issue with setter
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>