Minor cosmetics & change on the interruption