Lint fixes, clean up
More long overdue formatting cleanup