Cleanup
- improve linespaces