Fixed #13

Check and clean up comments