Make it pretty (cc @MaxWofford) :shipit:!