SSP-1100 Additional Main Tool formatting issues