Slimming down
modification to class