Fixed return signature error, tidied up signature creation