Added suggestions I was given.