Slight tweaks to order of operations