comments and cleanup
Merge https://github.com/airballoh87/itmidw