Fixes

- Fixed typo
- Some cleanups
- Converted whitespaces to tabs