Cleanups and rearrangement