Improved comment template, added support fo nested comments, removed unused "use" statements and renamed some variables.