More cleaning up and testing