Import, comments, and style fixes (minor)