removed volatile annotation on tail + code clean up