Reverting last change

Reverting last change, but keeping a bit of cleanup and organization.