Minor Fixes. Code cleanup.