Cleaned code.
Cleanup and pulling in changes from other dirs.