Adding datazilla integration, cleaning up code