Edited some files according to the comments of kaufi in GitHub