[WIP] Doc blocks cleanup & API lockup