Some code clean up and more bubbles.