Mostly code clean up.