Using vars instead of method calls

This should be clearer and even faster