More cleaning

Just moving things around for clarity.