some more cleanup by making use of property methods