Removed unnecessary variable checking