"use" and line ending tweaks