Remove normalise, tidy up.
Remove normalise, tidy up.