Added some cosmetic changes and updated a comment