Fix a bug
Clean up