Modified comment lines, cleaned things up a bit