clean up comments and varriable names based on @ElDeveloper's suggestions