Simplified a couple of functions

I don't think we need to create variables in situations like this...