I fixed some thing according to master's feedback.