cleaned up all code
altered setValuesFor methods