Move normalize out of @import