modified the two files according to PeP8