Change template
cleanup code