Remove unused import
Add normalization