removed some duplicate variables accross classes