Cleaned up signing process