All tests worked. Cleaned up the code.