Comments and cleanup.
Cleanup (x-mas)