Clean up whitespace

- tabs to spaces
- strip trailing whitespace
- add var's