Moving nomenclature commands to file Nomenclature.tex and arranging. It's better to define everything there than locally in the text to avoid redundance. This way I've more control.
Including more nomenclature and modifying parts of the text.