Commit final code changes.

Final commit of code changes.