Improve sign it management code a bit