Some commenting and code clean up