Class Template

minor changes