cosmetic changes and fixing a jenkins build issue