diff --git a/SiteGenerator/Sources/SiteGenerator/Generator/Contexts/PageContext.swift b/SiteGenerator/Sources/SiteGenerator/Generator/Contexts/PageContext.swift
index 151f12c..d69e790 100644
--- a/SiteGenerator/Sources/SiteGenerator/Generator/Contexts/PageContext.swift
+++ b/SiteGenerator/Sources/SiteGenerator/Generator/Contexts/PageContext.swift
@@ -14,7 +14,7 @@ struct PageContext {
     let metadata: [String: String]
 }
 
-extension PageContext: TemplateContext {
+extension PageContext {
     var template: String {
         page.template ?? site.template
     }
diff --git a/SiteGenerator/Sources/SiteGenerator/Generator/Contexts/SiteContext.swift b/SiteGenerator/Sources/SiteGenerator/Generator/Contexts/SiteContext.swift
index 7ce0b71..5aa77f9 100644
--- a/SiteGenerator/Sources/SiteGenerator/Generator/Contexts/SiteContext.swift
+++ b/SiteGenerator/Sources/SiteGenerator/Generator/Contexts/SiteContext.swift
@@ -17,7 +17,7 @@ struct SiteContext {
     }
 }
 
-extension SiteContext: TemplateContext {
+extension SiteContext {
     var dictionary: [String: Any] {
         [
             "site": site,
diff --git a/SiteGenerator/Sources/SiteGenerator/Generator/Contexts/TemplateContext.swift b/SiteGenerator/Sources/SiteGenerator/Generator/Contexts/TemplateContext.swift
deleted file mode 100644
index 477b9bc..0000000
--- a/SiteGenerator/Sources/SiteGenerator/Generator/Contexts/TemplateContext.swift
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  TemplateContext.swift
-//  SiteGenerator
-//
-//  Created by Sami Samhuri on 2019-12-02.
-//
-
-import Foundation
-
-protocol TemplateContext {
-    var template: String { get }
-
-    var dictionary: [String : Any] { get }
-}
diff --git a/SiteGenerator/Sources/SiteGenerator/Posts/PostsByYear.swift b/SiteGenerator/Sources/SiteGenerator/Posts/PostsByYear.swift
index 726284d..f4fb5b0 100644
--- a/SiteGenerator/Sources/SiteGenerator/Posts/PostsByYear.swift
+++ b/SiteGenerator/Sources/SiteGenerator/Posts/PostsByYear.swift
@@ -20,6 +20,8 @@ struct MonthPosts {
     }
 }
 
+// MARK: -
+
 struct YearPosts {
     let year: Int
     var byMonth: [Month: MonthPosts]
@@ -46,6 +48,8 @@ struct YearPosts {
     }
 }
 
+// MARK: -
+
 struct PostsByYear {
     private(set) var byYear: [Int: YearPosts]