Stop computing two useless values and fix a comment