deleted old code
proper naming