Code formatting, replace norm name symbols with full name one
Added some TODOs and other comments