Clean up signatures a bit