Amine Hassou

### NOTE TO NEW CONTRIBUTORS Please only convert one component; choose a different issue after you've completed one. These are low-priority refactoring tasks, but they still require code review and...