[isuue #83 spaces modified to follow conventions