Cleanups and clarity