Clean up from #76. :v: