Code is cleaned up a little.