Cleanups and formatting