Clean up template and remove console.log