cleanup and adding devtools info