[~TASK] Restructuring of comments