Cleaned the code up a little. and made a test.