Cleaned up source and tests.