Done cleaning up #s