Slight optimization changes - (very slight)