Adding querystring builder and cleaning up