Fixed normalizer

 - Tested properly with my implementation now.
 - Removed @notsure annotations