minor Database spec reformatting
minor Signature refactorings