did some cleaning up particularily with ss(