Removed passing of instance variable within class