Cleanup and code commenting.