Further code clean up.