Thanks for the review! I agree it makes sense to move the code up so that other settings are derived accordingly.