Clean up usage a bit