Apply parts of PR/4 from @Nami-Doc++

Parts of the PR did not meet the "rules" of the project.