Add comment to clarify the purpose of some code
Cleanups