[Fix] Fix comments and documentation for easier maintenance later