made code more firm style