Another try at fixing formatting