Minor - cosmetic changes