Some commenting and cleanup