Tidy code, eliminate LOCAL_BUFFER and add on/off switch for all identifiers