make tearDown() workable
fixed several style issues