Clean up Normal and NormalCanon (mainly cosmetic changes)