Cleaned up my template