Added a few cosmetic changes