Clean up imports
Added NN to tag list