Little bit of code commenting and cleanup.