More clean up, small changes