adding more comments, utility classes, etc