Cleanup and little fix.
cleanup.