Creating a bit of logic to avoid creating extra variables if possible

Creating a bit of logic to avoid creating extra variables if possible #165