cleanup var names
cleaned up test code