Continuing code clean up.