house cleaning

reorganized some things