Added some cosmetic changes for clarity