cs cleanup and rename some arbitrary to extra