General code clean up.