Code Refactorizarion