Fix some bug and Rename some method for better understanding