Patch logic simplification

Made some logic pieces a bit simpler.