Cleanups, formatting fixes