diff --git a/resources/views/components/post/article.blade.php b/resources/views/components/post/article.blade.php
index 63f8e427..ec8bd0a2 100644
--- a/resources/views/components/post/article.blade.php
+++ b/resources/views/components/post/article.blade.php
@@ -9,8 +9,8 @@
         <h1 itemprop="headline" class="mb-4">{{ $title ?? 'Blog Post' }}</h1>
 		<div id="byline" aria-label="About the post" role="doc-introduction">
             @includeWhen($post->date, 'hyde::components.post.date')
-		    @includeWhen($author, 'hyde::components.post.author')
-            @includeWhen($category, 'hyde::components.post.category')
+		    @includeWhen($post->author, 'hyde::components.post.author')
+            @includeWhen($post->category, 'hyde::components.post.category')
         </div>
     </header>
     @includeWhen(isset($post->image), 'hyde::components.post.image')
diff --git a/resources/views/components/post/author.blade.php b/resources/views/components/post/author.blade.php
index b01f73a4..b27dede3 100644
--- a/resources/views/components/post/author.blade.php
+++ b/resources/views/components/post/author.blade.php
@@ -1,13 +1,10 @@
-@php
-	$authorObject = Hyde\Framework\Services\AuthorService::find($author);
-@endphp
 by author
 <address itemprop="author" itemscope itemtype="https://schema.org/Person" aria-label="The post author" style="display: inline;"> 
-	@if($authorObject && $authorObject->website)
-	<a href="{{ $authorObject->website }}" rel="author" itemprop="url" aria-label="The author's website">
+	@if($post->author->website)
+	<a href="{{ $post->author->website }}" rel="author" itemprop="url" aria-label="The author's website">
 	@endif
-	<span itemprop="name" aria-label="The author's name" {{ $authorObject && $authorObject->username ? 'title=@'.$authorObject->username.'' : '' }}>{{ $authorObject->name ?? $author }}</span> 
-	@if($authorObject && $authorObject->website)
+	<span itemprop="name" aria-label="The author's name" {{ $post->author->username ? 'title=@'.$post->author->username.'' : '' }}>{{ $post->author->name ?? $post->author->username }}</span> 
+	@if($post->author->website)
 	</a>
 	@endif
 </address> 
diff --git a/resources/views/components/post/category.blade.php b/resources/views/components/post/category.blade.php
index cb6c7f5f..886cf6bc 100644
--- a/resources/views/components/post/category.blade.php
+++ b/resources/views/components/post/category.blade.php
@@ -1 +1 @@
-in the category "{{ $category }}"
+in the category "{{ $post->category }}"
diff --git a/resources/views/layouts/post.blade.php b/resources/views/layouts/post.blade.php
index fb2ddc4e..8a37f227 100644
--- a/resources/views/layouts/post.blade.php
+++ b/resources/views/layouts/post.blade.php
@@ -2,13 +2,6 @@
 @extends('hyde::layouts.app')
 @section('content')
 
-@php
-$title = $post->matter['title'] ?? false;
-$description = $post->matter['description'] ?? false;
-$category = $post->matter['category'] ?? false;
-$author = $post->matter['author'] ?? false;
-@endphp
-
 @push('meta')
 <!-- Blog Post Meta Tags -->
 @foreach ($post->getMetadata() as $name => $content)