Minor Style changes and updates