Improve Code Refacotring