cleaned up unused imports, fixed some structural items