Some shuffling and cleanup