some cleanup/organization changes