:spaghetti: Addressed Taylor's PR feedback.