Cleanups and ordering