Gorilla code clean up.