Variable name and cleanup.
Continue cleanup.
Cleanup and comment implementation part #1.