Code Refac