Some code cleanup; "strict" violation by undeclared variable fixed;
added setValues() as public method

Change-Id: I09385d504d42aa5c7ab0f91cd35460d7eddc11d2