Cleaned up / reorganized some things.