Fixed some codes as the code reviews by helix84