clean up and added unit test