Small and cosmetic changes into shared branch for testing