10 - Imports & Quick Refactor