Code cleanup
Wording