more cleanup

- removing that = this
- indenting and line spacing