Specify version 2.0 and clean up comments at beginning of file