update formatting
- minor refactorings