mod. trouble-shooter layout and comments
cleaning duplicate code