- Improve code comments
- Avoid buffer magic number