improve mesage and style