cleanup
add tips for template