More and more code cleaning up.