Cleanup and made the client work with both analysis methods