removed elif from templates