Add return value to Procedure, remove Function