Minor code optimization

stripping more code and a variable optimization