Polishing

- Minor doc polish + change tabs to spaces in code
- Enhance test to include expressions