[TASK] Cleanup the code & documentation