Formatting, cleanups