Some minor reorganization.

Signed-off-by: Chase Pettit <chasepettit@gmail.com>