Code Refactory