Cleanup

This makes the two functions more diff-friendly.