Even more clean up, but ready for testing