cleaning up - added unit testing