Final Code Clean Up

A final code clean up.