Switch order of code blocks (minor)