Formatting
Wording and removed unused code