Added identifiers, tweaked function declarations