reverting previous optimization as it didn't optimize and it did obfuscate.