more caching
removing unneeded variable