Cleaning up norm code