class cleanup and string querystring parsing