spring cleaning, imports and header