cleanup basic template a bit