Code cleanup and addition of service to return network results