Clean up
Add unit test
Add test for webservice