cleaned up code
new test run