More clean up, commenting and rearrangement