Make template structure better