Further code clean up