Comments and cleanup
Call this version 2, add commmentary