- Fixing some inline doc
- Doing some refactoring