Changed instant variable to local for appro ones