Introducing template
cleanup