Cleaned up the template (#121)