Some commenting and clean up