Reordered some things in .cpp; no functional change