Fixing template whitespaces