- Fix hanging connection when error is sent back to the client
- Renaming
- Code analysis