small changes in naming and spacing