Fixed and Refactory

Fixed and Refactory